Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERT Overhaul 2.0 #301

Closed

Conversation

Tryded
Copy link
Contributor

@Tryded Tryded commented Oct 25, 2023

Adds different ERT levels for different level of threats
Scales from (Smallest Threat to Largest):
Amber: Mostly when crew is extremely understaffed, small threats or a lot of people are dead. No Hardsuits except for Engineering ERT.
Red: For when something terrible has happened for example a traitor single handily killing the entire station's command and security or when nukies take WAY too long.
Gamma: When something catastrophic has happened on the station and you need brute force. For example, revs has taken over majority of the station, every traitor somehow worked together to kill the entire station or everything is burning down. (Spess dragon, your bootleg spess wizards, or way too much zombies.)

About the PR

Admene QOL and ERT loadout changes. All ERT also has mindshields now.

Why / Balance

ERT is currently extremely overpower (mainly their pulse weaponry) and that is one reason why admins don't want to use ERTs at all even if the station desperately needs it.

Technical details

Media

Reae

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 25, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 25, 2023

RSI Diff Bot; head commit a0c03a4 merging into 76d02c2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/automatic_laser_carbine.rsi

State Old New Status
base Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added

Edit: diff updated after a0c03a4

@DebugOk
Copy link
Contributor

DebugOk commented Oct 25, 2023

Will not be merged until after we've declared the codebase stable and mostly complete

@DebugOk DebugOk added the S: Do Not Merge Don't merge this yet label Oct 25, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 26, 2023
@Tryded
Copy link
Contributor Author

Tryded commented Oct 27, 2023

What does conflicts mean

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 27, 2023
@Tryded
Copy link
Contributor Author

Tryded commented Oct 27, 2023

What does conflicts mean

Fixed

@DebugOk DebugOk requested a review from Colin-Tel as a code owner November 1, 2023 00:28
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 1, 2023
Copy link
Contributor

github-actions bot commented Nov 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added S: Merge Conflict Fix your PR! and removed S: Merge Conflict Fix your PR! labels Nov 1, 2023
Copy link
Contributor

github-actions bot commented Nov 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

github-actions bot commented Nov 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@DebugOk
Copy link
Contributor

DebugOk commented Nov 4, 2023

ERT was recently overhauled by wizden, theres too many merge conflicts right now to keep this open

@DebugOk DebugOk closed this Nov 4, 2023
@Tryded
Copy link
Contributor Author

Tryded commented Nov 5, 2023

ERT was recently overhauled by wizden, theres too many merge conflicts right now to keep this open

I was waiting for the codebase to be declared stable to continue working on this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files S: Do Not Merge Don't merge this yet S: Merge Conflict Fix your PR! S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants